projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4ec00b0
)
Fix assertion violation with zero-width :box attributes
author
Eli Zaretskii
<eliz@gnu.org>
Mon, 20 Sep 2021 12:22:07 +0000
(15:22 +0300)
committer
Eli Zaretskii
<eliz@gnu.org>
Mon, 20 Sep 2021 12:22:07 +0000
(15:22 +0300)
* src/xfaces.c (merge_face_ref): Don't allow :box attribute with a
zero value. (Bug#50699)
src/xfaces.c
patch
|
blob
|
history
diff --git
a/src/xfaces.c
b/src/xfaces.c
index aefed54ebcb6edaae0811d7271bcc1ef6698762b..c5b7a568aeb05aee75272041d35fe2c29cc36297 100644
(file)
--- a/
src/xfaces.c
+++ b/
src/xfaces.c
@@
-2709,7
+2709,7
@@
merge_face_ref (struct window *w,
{
if (EQ (value, Qt))
value = make_fixnum (1);
- if (
FIXNUMP (value
)
+ if (
(FIXNUMP (value) && XFIXNUM (value) != 0
)
|| STRINGP (value)
|| CONSP (value)
|| NILP (value))